From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 1 Sep 2011 14:51:44 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~846^2~1^2~1
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=fd09688b0bbd5ee8011e78a1f4e794603e27232f;p=emacs.git

Merge from trunk.
---

fd09688b0bbd5ee8011e78a1f4e794603e27232f